Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[DO NOT MERGE] adapt test stderr for LLVM 18 changes #119185

Closed
wants to merge 1 commit into from
Closed

[DO NOT MERGE] adapt test stderr for LLVM 18 changes #119185

wants to merge 1 commit into from

Conversation

krasimirgg
Copy link
Contributor

Example stderr updates for #119120.

r? @ghost

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 21, 2023
@rust-log-analyzer
Copy link
Collaborator

The job x86_64-gnu-llvm-16 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot) 
GITHUB_ACTION=__run_7
GITHUB_ACTIONS=true
GITHUB_ACTION_REF=
GITHUB_ACTION_REPOSITORY=
GITHUB_ACTOR=krasimirgg
GITHUB_API_URL=https://api.github.com
GITHUB_BASE_REF=master
GITHUB_ENV=/home/runner/work/_temp/_runner_file_commands/set_env_57dd3f52-0eb5-4938-bc1e-01ec643bb32c
GITHUB_EVENT_NAME=pull_request
---
GITHUB_SERVER_URL=https://github.com
GITHUB_SHA=4788e4eb4951d2478f326314608d9d17a650d636
GITHUB_STATE=/home/runner/work/_temp/_runner_file_commands/save_state_57dd3f52-0eb5-4938-bc1e-01ec643bb32c
GITHUB_STEP_SUMMARY=/home/runner/work/_temp/_runner_file_commands/step_summary_57dd3f52-0eb5-4938-bc1e-01ec643bb32c
GITHUB_TRIGGERING_ACTOR=krasimirgg
GITHUB_WORKFLOW_REF=rust-lang/rust/.github/workflows/ci.yml@refs/pull/119185/merge
GITHUB_WORKFLOW_SHA=4788e4eb4951d2478f326314608d9d17a650d636
GITHUB_WORKSPACE=/home/runner/work/rust/rust
GOROOT_1_19_X64=/opt/hostedtoolcache/go/1.19.13/x64
---
Built container sha256:9c3c93a371e5aed5c18185b24f130d95d5140dbd72a9b325e7b6b49e521a4faa
Looks like docker image is the same as before, not uploading
https://ci-caches.rust-lang.org/docker/7ebc15c01a233894034d277c8cce4e949f4e7791f66b4727c8fb6e058a0b8171d6152e1441d677cef0653843ceeee469c097b8699b2bb74249e674f6aa1a8813
sha256:9c3c93a371e5aed5c18185b24f130d95d5140dbd72a9b325e7b6b49e521a4faa
Setting extra environment values for docker:  --env ENABLE_GCC_CODEGEN=1 --env GCC_EXEC_PREFIX=/usr/lib/gcc/
[CI_JOB_NAME=x86_64-gnu-llvm-16]
##[group]Clock drift check
  local time: Thu Dec 21 12:13:38 UTC 2023
  network time: Thu, 21 Dec 2023 12:13:38 GMT
  network time: Thu, 21 Dec 2023 12:13:38 GMT
##[endgroup]
sccache: Starting the server...
##[group]Configure the build
configure: processing command line
configure: 
configure: build.configure-args := ['--build=x86_64-unknown-linux-gnu', '--llvm-root=/usr/lib/llvm-16', '--enable-llvm-link-shared', '--set', 'rust.thin-lto-import-instr-limit=10', '--enable-verbose-configure', '--enable-sccache', '--disable-manage-submodules', '--enable-locked-deps', '--enable-cargo-native-static', '--set', 'rust.codegen-units-std=1', '--set', 'dist.compression-profile=balanced', '--dist-compression-formats=xz', '--disable-dist-src', '--release-channel=nightly', '--enable-debug-assertions', '--enable-overflow-checks', '--enable-llvm-assertions', '--set', 'rust.verify-llvm-ir', '--set', 'rust.codegen-backends=llvm,cranelift,gcc', '--set', 'llvm.static-libstdcpp', '--enable-missing-tools', '--enable-new-symbol-mangling']
configure: target.x86_64-unknown-linux-gnu.llvm-config := /usr/lib/llvm-16/bin/llvm-config
configure: llvm.link-shared     := True
configure: rust.thin-lto-import-instr-limit := 10
configure: rust.codegen-units-std := 1
---
diff of stderr:

1 error: unknown directive
-    |
- note: instantiated into assembly here
-   --> <inline asm>:1:1
-    |
- LL | .intel_syntax noprefix
- 
- 
+ .intel_syntax noprefix
9 error: unknown directive
-    |
- note: instantiated into assembly here
- note: instantiated into assembly here
-   --> <inline asm>:1:1
-    |
- LL | .intel_syntax noprefix
-    | ^
-    = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
- 
+ .intel_syntax noprefix
18 error: unknown directive
19    |
20 note: instantiated into assembly here

---
100 


The actual stderr differed from the expected stderr.
Actual stderr saved to /checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/asm/inline-syntax.arm/inline-syntax.arm.stderr
To only update this specific test, also pass `--test-args asm/inline-syntax.rs`


error in revision `arm`: 1 errors occurred comparing output.
status: exit status: 1
command: RUSTC_ICE="0" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/asm/inline-syntax.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--cfg" "arm" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/asm/inline-syntax.arm" "-A" "unused" "-A" "internal_features" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/asm/inline-syntax.arm/auxiliary" "--target" "armv7-unknown-linux-gnueabihf"
--- stderr -------------------------------
error: unknown directive
.intel_syntax noprefix
^
^
error: unknown directive
.intel_syntax noprefix
^
error: unknown directive
   |
note: instantiated into assembly here
  --> <inline asm>:1:1
   |
LL | .intel_syntax noprefix

error: unknown directive
##[error]  --> /checkout/tests/ui/asm/inline-syntax.rs:32:15
   |
   |
LL |         asm!(".intel_syntax noprefix", "nop");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     .intel_syntax noprefix
   |     ^

error: unknown directive
error: unknown directive
##[error]  --> /checkout/tests/ui/asm/inline-syntax.rs:35:15
   |
LL |         asm!(".intel_syntax aaa noprefix", "nop");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     .intel_syntax aaa noprefix

error: unknown directive
##[error]  --> /checkout/tests/ui/asm/inline-syntax.rs:38:15
   |
   |
LL |         asm!(".att_syntax noprefix", "nop");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     .att_syntax noprefix

error: unknown directive
##[error]  --> /checkout/tests/ui/asm/inline-syntax.rs:41:15
   |
   |
LL |         asm!(".att_syntax bbb noprefix", "nop");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     .att_syntax bbb noprefix

error: unknown directive
##[error]  --> /checkout/tests/ui/asm/inline-syntax.rs:44:15
   |
   |
LL |         asm!(".intel_syntax noprefix; nop");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
   |
LL |     .intel_syntax noprefix; nop

error: unknown directive
##[error]  --> /checkout/tests/ui/asm/inline-syntax.rs:50:13
   |
   |
LL |             .intel_syntax noprefix
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
LL |             .intel_syntax noprefix
   |             ^

error: aborting due to 7 previous errors

@nico
Copy link

nico commented Dec 22, 2023

I tried patching this in and I still see failures in this test building against LLVM head (but the error is smaller than without this):

 failures:
 
 ---- [ui] tests/ui/asm/inline-syntax.rs#arm stdout ----
 diff of stderr:
 
 13	   |
 14	LL | .intel_syntax noprefix
 15	   | ^
 -	   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
 17	
 18	error: unknown directive
 -	   |
 -	note: instantiated into assembly here
 -	  --> <inline asm>:1:1
 -	   |
 -	LL | .intel_syntax noprefix
 -	   | ^
 -	
 -	error: unknown directive
 27	  --> $DIR/inline-syntax.rs:32:15
 28	   |
 29	LL |         asm!(".intel_syntax noprefix", "nop");
 
 95	LL |             .intel_syntax noprefix
 96	   |             ^
 97	
 -	error: aborting due to 9 previous errors
 +	error: aborting due to 8 previous errors
 99	
 100

Am I holding it wrong? Has something else changed upstream?

(From https://bugs.chromium.org/p/chromium/issues/detail?id=1513478#c2)

@nico
Copy link

nico commented Dec 22, 2023

Oh, we build a slightly older version of rust with this cherry-picked in, instead of using head rust. Maybe that's why?

@Dylan-DPC Dylan-DPC added S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 19, 2024
@Dylan-DPC
Copy link
Member

@krasimirgg any updates on this? do we still need this? thanks

@bors
Copy link
Contributor

bors commented Sep 19, 2024

☔ The latest upstream changes (presumably #130534) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 19, 2024
@nikic
Copy link
Contributor

nikic commented Sep 19, 2024

Closing this in favor of #120094.

@nikic nikic closed this Sep 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
S-experimental Status: Ongoing experiment that does not require reviewing and won't be merged in its current state. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@krasimirgg @rust-log-analyzer @nico @Dylan-DPC @bors @nikic @rustbot